Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: linking existing customer to new Patient overwrites Customer Name (backport #306) #309

Merged
merged 3 commits into from
Nov 1, 2023
Merged

fix: linking existing customer to new Patient overwrites Customer Name (backport #306) #309

merged 3 commits into from
Nov 1, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 1, 2023

This is an automatic backport of pull request #306 done by Mergify.
Cherry-pick of c5d9de2 has failed:

On branch mergify/bp/version-14-hotfix/pr-306
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit c5d9de2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   healthcare/healthcare/doctype/patient/test_patient.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   healthcare/healthcare/doctype/patient/patient.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@akurungadam @mergify
fix: linking existing customer to new Paitient overwrites customer na…
849e530 
…me and other details (#306)

test for the same

(cherry picked from commit c5d9de2)

# Conflicts:
#	healthcare/healthcare/doctype/patient/patient.py
@mergify mergify bot requested a review from akurungadam as a code owner November 1, 2023 06:45
@mergify mergify bot added the conflicts label Nov 1, 2023
@mergify mergify bot requested a review from akashkrishna619 as a code owner November 1, 2023 06:45
@akashkrishna619 akashkrishna619 merged commit 22f54a9 into version-14-hotfix Nov 1, 2023
6 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-306 branch November 1, 2023 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akurungadam akurungadam Awaiting requested review from akurungadam akurungadam is a code owner

@akashkrishna619 akashkrishna619 Awaiting requested review from akashkrishna619 akashkrishna619 is a code owner

Assignees

@akurungadam akurungadam

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@akurungadam @akashkrishna619